Skip to content

Merge master into feature/smus#8321

Merged
laileni-aws merged 29 commits intofeature/smusfrom
autoMerge/feature/smus
Nov 19, 2025
Merged

Merge master into feature/smus#8321
laileni-aws merged 29 commits intofeature/smusfrom
autoMerge/feature/smus

Conversation

@aws-toolkit-automation
Copy link
Collaborator

Automatic merge failed

  • Resolve conflicts and push to this PR branch.
  • Do not squash-merge this PR. Use the "Create a merge commit" option to do a regular merge.

Command line hint

To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):

git stash
git fetch --all
git checkout origin/feature/smus
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/smus

aws-toolkit-automation and others added 27 commits November 7, 2025 14:13
- Add CloudFormation Language Server Protocol support with multiple provider options
- Include CloudFormation explorer with stack, resource, and change set management
- Add stack deployment, validation, and change set workflows with S3 upload support
- Include drift detection and diff visualization capabilities
- Add CloudFormation environment and project management with cfn-init integration
- Include telemetry and authentication handling
- Add comprehensive test coverage for all CloudFormation features
- Update package configurations and language syntax highlighting
…ents

- Remove resource type from list using right click
- Few startup fixes for CloudFormation extension
- Add exec permissions and support node versions
- Add node to AWS Explorer CFN panel
- Add prompt for deploymentMode and plumb to deployment
- Coordinate stack views and add overview to CFN console
- Fix extract to parameter cursor command
…ents

* Remove resource type from list using right click
* Few startup fixes for CloudFormation extension
* Add exec permissions and support node versions
* Add node to AWS Explorer CFN panel
* Add prompt for deploymentMode and plumb to deployment
* Coordinate stack views and add overview to CFN console
* Fix extract to parameter cursor command
feat(cloudformation): Merge CloudFormation LSP integration with toolkit updates
…es (#8303)

Includes all CloudFormation improvements and fixes from November 9th
through November 17th:
- Integration tests and LSP server workflow scripts
- Online error handling improvements
- CommaDelimitedList validation and boolean support
- Restart server command fixes and autocomplete improvements
- CFN init typing and consolidated commands
- LSP logs and exception handling
- Pagination and search in import/clone commands
- Resource type request handling
- Environment command error handling
- Project creation UI improvements
- LSP integration tests for offline features
- Reference-counted status bar implementation
- Expand/collapse arrow and resource messaging updates
- Stack events and resources loading improvements
- Validation workflow enhancements
- Resource management and provider naming
- Non-blocking CFN operations and restart LSP functionality
- Deep linking to stack information views
- E2E test infrastructure setup
- Deployment workflow alignment
- Cached CFN server offline support
- LSP installation process updates
- Startup fixes and permission handling
- AWS Explorer CFN panel integration
- Deployment mode prompts and stack view coordination
- Overview integration and parameter extraction fixes
- Panel metrics and telemetry improvements
- S3 upload support and file selection
- Icon updates and environment warnings
- Command palette fixes and document management
- Related resources workflow improvements
- Windows target fixes and validation improvements
- Environment naming and resource state management
- Stack description and telemetry configuration
- Deployment/validation icons and usage tracking
- Permission handling and resource loading
- Environment file selection and experimental flag removal
- Endpoint configuration and ChangeSet diff redesign
- S3 upload validation and inline completion removal
- Stack output viewing and installation cleanup
- Resource detail views and change set functionality
- Dry run fixes and icon updates
- Related resources API and change set commands
- Stack event fetching and authentication updates
- Drift indication and change set deletion
- Credential encryption and diff viewer improvements
- CFN init UI and empty node set handling
- Stack overview pages and environment selection
- View diff improvements and resource command updates
- CloudFormation prefix usage and change set logic
- Command execution controls and deployment confirmation
- Document management and resource node simplification
- Region management and settings updates
- Resource/stack pagination and explorer node additions
- Version selection and color fixes
- Stack refresh listeners and LSP server locator improvements
- CFN-lint/guard settings and diff provider enhancements
- Managed resource import warnings and resource import support
- Telemetry/client ID configuration and regionality improvements
- Clone/stack info restoration and package.json updates
- LSP stream improvements and authentication fixes

## Problem


## Solution


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Co-authored-by: manodnyab <66754471+manodnyab@users.noreply.github.com>
…ges (#8319)

## Problem
fix(cloudformation): fix a few testing issues

## Solution
- Remove `**/cloudformation-languageserver/**` from tests coverage
- Drop an integration test for SAM schema downloads

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Co-authored-by: Laxman Reddy <141967714+laileni-aws@users.noreply.github.com>
feat(cloudformation): Update CloudFormation feature with latest changes
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner November 19, 2025 15:50
## Problem

-
https://d1ihu6zq92vp9p.cloudfront.net/45451b0f-383e-4f4a-adc0-ce623f5765be/report.html
```
Error: Activating extension 'redhat.java' failed: Java 21 or more recent is required to run the Java extension. Please download and install a recent JDK. You can still compile your projects with older JDKs by configuring ['java.configuration.runtimes'](https://github.com/redhat-developer/vscode-java/wiki/JDK-Requirements#java.configuration.runtimes).
    at v.n (/tmp/.vscode-test/vscode-linux-x64-1.83.0/resources/app/out/vs/workbench/api/node/extensionHostProcess.js:125:6274)
    at async v.m (/tmp/.vscode-test/vscode-linux-x64-1.83.0/resources/app/out/vs/workbench/api/node/extensionHostProcess.js:125:6168)
    at async v.l (/tmp/.vscode-test/vscode-linux-x64-1.83.0/resources/app/out/vs/workbench/api/node/extensionHostProcess.js:125:5625)
```

- The Python 3.14 version is coming from the external Serverless Land
repository pattern (aws-samples/serverless-patterns)
## Solution
- Fixed tests


---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
@laileni-aws laileni-aws merged commit f86dec1 into feature/smus Nov 19, 2025
36 of 37 checks passed
@laileni-aws laileni-aws deleted the autoMerge/feature/smus branch November 19, 2025 23:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants